<!DOCTYPE html>
<<<<<<< HEAD
<html lang="zh-CN">

<head>
	<meta charset="UTF-8">
	<title>主页</title>
	<meta http-equiv="X-UA-Compatible" content="IE=edge">
	<meta name="viewport" content="width=device-width, initial-scale=1.0">
	<link rel="stylesheet" href="./home.css/style.css">
</head>
<body>
	<canvas id="fireflies"></canvas>
	<div id="title">
		<div id="topborder"></div>
		<h1 class="splitting">
			<span class="char s">欢</span><span class="char t">迎</span><span class="char r">你</span><span
				class="char a">;</span><span class="char n">朋</span><span class="char g">友</span><span
				class="char e">9</span><span class="char r2">组</span>
		</h1>
		<h2 class="splitting">
			<span class="things">
				<span class="thingst char">十</span><span class="thingsh char">指</span><span
					class="thingsi char">敲</span><span class="thingsn char">动</span><span
					class="thingsg char">未</span><span class="thingss char">来</span>
			</span>
		</h2>
		<div id="leftborder"></div>
		<div id="rightborder"></div>
	</div>

	<script src='./home.js/modernizr.min.js'></script>
	<script src="./home.js/script.js"></script>

>>>>>>> dev
=======
<html lang="en">
<head>
  <meta charset="UTF-8">
  <title>Document</title>
</head>
<body>
  主页
>>>>>>> 7da7a0b03316e7b9f13720c597351913ac1c6794
</body>
</html>